From 2d770e946ad85e5891a9696e7d0de43947b0179d Mon Sep 17 00:00:00 2001 From: Owen Taylor Date: Tue, 12 Mar 2002 20:01:47 +0000 Subject: [PATCH] Fix incorrect return value, filter out returns of 0x7f for the delete key. Tue Mar 12 10:50:09 2002 Owen Taylor * modules/input/gtkimcontextxim.c (gtk_im_context_xim_filter_keypress): Fix incorrect return value, filter out returns of 0x7f for the delete key. (#74179, Kang Jeong-He) --- ChangeLog | 6 ++++++ ChangeLog.pre-2-0 | 6 ++++++ ChangeLog.pre-2-10 | 6 ++++++ ChangeLog.pre-2-2 | 6 ++++++ ChangeLog.pre-2-4 | 6 ++++++ ChangeLog.pre-2-6 | 6 ++++++ ChangeLog.pre-2-8 | 6 ++++++ NEWS | 2 +- README.in | 2 +- modules/input/gtkimcontextxim.c | 9 +++++---- 10 files changed, 49 insertions(+), 6 deletions(-) diff --git a/ChangeLog b/ChangeLog index 2285ccf53f..cdcc2c3ebf 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +Tue Mar 12 10:50:09 2002 Owen Taylor + + * modules/input/gtkimcontextxim.c (gtk_im_context_xim_filter_keypress): + Fix incorrect return value, filter out returns of 0x7f for + the delete key. (#74179, Kang Jeong-He) + Mon Mar 11 23:42:11 2002 Jonathan Blandford * gtk/gtktreemodel.c (gtk_tree_model_foreach): fix totally broken diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0 index 2285ccf53f..cdcc2c3ebf 100644 --- a/ChangeLog.pre-2-0 +++ b/ChangeLog.pre-2-0 @@ -1,3 +1,9 @@ +Tue Mar 12 10:50:09 2002 Owen Taylor + + * modules/input/gtkimcontextxim.c (gtk_im_context_xim_filter_keypress): + Fix incorrect return value, filter out returns of 0x7f for + the delete key. (#74179, Kang Jeong-He) + Mon Mar 11 23:42:11 2002 Jonathan Blandford * gtk/gtktreemodel.c (gtk_tree_model_foreach): fix totally broken diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 2285ccf53f..cdcc2c3ebf 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,9 @@ +Tue Mar 12 10:50:09 2002 Owen Taylor + + * modules/input/gtkimcontextxim.c (gtk_im_context_xim_filter_keypress): + Fix incorrect return value, filter out returns of 0x7f for + the delete key. (#74179, Kang Jeong-He) + Mon Mar 11 23:42:11 2002 Jonathan Blandford * gtk/gtktreemodel.c (gtk_tree_model_foreach): fix totally broken diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index 2285ccf53f..cdcc2c3ebf 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,3 +1,9 @@ +Tue Mar 12 10:50:09 2002 Owen Taylor + + * modules/input/gtkimcontextxim.c (gtk_im_context_xim_filter_keypress): + Fix incorrect return value, filter out returns of 0x7f for + the delete key. (#74179, Kang Jeong-He) + Mon Mar 11 23:42:11 2002 Jonathan Blandford * gtk/gtktreemodel.c (gtk_tree_model_foreach): fix totally broken diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index 2285ccf53f..cdcc2c3ebf 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,9 @@ +Tue Mar 12 10:50:09 2002 Owen Taylor + + * modules/input/gtkimcontextxim.c (gtk_im_context_xim_filter_keypress): + Fix incorrect return value, filter out returns of 0x7f for + the delete key. (#74179, Kang Jeong-He) + Mon Mar 11 23:42:11 2002 Jonathan Blandford * gtk/gtktreemodel.c (gtk_tree_model_foreach): fix totally broken diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 2285ccf53f..cdcc2c3ebf 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,9 @@ +Tue Mar 12 10:50:09 2002 Owen Taylor + + * modules/input/gtkimcontextxim.c (gtk_im_context_xim_filter_keypress): + Fix incorrect return value, filter out returns of 0x7f for + the delete key. (#74179, Kang Jeong-He) + Mon Mar 11 23:42:11 2002 Jonathan Blandford * gtk/gtktreemodel.c (gtk_tree_model_foreach): fix totally broken diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 2285ccf53f..cdcc2c3ebf 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,9 @@ +Tue Mar 12 10:50:09 2002 Owen Taylor + + * modules/input/gtkimcontextxim.c (gtk_im_context_xim_filter_keypress): + Fix incorrect return value, filter out returns of 0x7f for + the delete key. (#74179, Kang Jeong-He) + Mon Mar 11 23:42:11 2002 Jonathan Blandford * gtk/gtktreemodel.c (gtk_tree_model_foreach): fix totally broken diff --git a/NEWS b/NEWS index 36a02a3612..4955bd9639 100644 --- a/NEWS +++ b/NEWS @@ -126,7 +126,7 @@ Overview of Changes in GTK+ 1.3.13 [Mark Patton] * gtk_widget_set_accel_path() is now publically exported. -Other contributors: Darin Adler, Jeffry Baker, Damon Chaplin, Brian Cameron, +Other contributors: Darin Adler, Jeffrey Baker, Damon Chaplin, Brian Cameron, Murray Cumming, James Henstridge, Jacob Berkman, Arnaud Charlet, Jeff Franks, Jeff Garzik, Jody Goldberg, Diego Gonzalez, Melvin Hadasht, Raja Harinath, Tim Janik, Mike Kestner, Mathieu Lacage, Alex Larsson, Ryan Lovett, diff --git a/README.in b/README.in index ef5bc45e3d..5b958dfd9c 100644 --- a/README.in +++ b/README.in @@ -1,4 +1,4 @@ -General Information +General InformationaaaaaX =================== This is GTK+ version @GTK_VERSION@. GTK+ is a multi-platform toolkit for diff --git a/modules/input/gtkimcontextxim.c b/modules/input/gtkimcontextxim.c index ec7565aeef..a76b667de1 100644 --- a/modules/input/gtkimcontextxim.c +++ b/modules/input/gtkimcontextxim.c @@ -379,9 +379,10 @@ gtk_im_context_xim_filter_keypress (GtkIMContext *context, result_utf8 = mb_to_utf8 (context_xim, buffer); if (result_utf8) { - if ((guchar)result_utf8[0] >= 0x20) /* Some IM have a nasty habit of converting - * control characters into strings - */ + if ((guchar)result_utf8[0] >= 0x20 && + result_utf8[0] != 0x7f) /* Some IM have a nasty habit of converting + * control characters into strings + */ { g_signal_emit_by_name (context, "commit", result_utf8); result = TRUE; @@ -391,7 +392,7 @@ gtk_im_context_xim_filter_keypress (GtkIMContext *context, } } - return FALSE; + return result; } static void -- 2.30.2